Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 6 Jan 2010 23:07:49 +0000 (23:07 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 6 Jan 2010 23:07:49 +0000 (23:07 +0000)

Trivial merge